fix #62365

2001-10-22  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix
	#62365

diff --git a/ChangeLog b/ChangeLog
index db5429d62d71b84b661e61fecc26945e81397cb4..f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 
+       #62365
+
 2001-10-22  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_window_type): fix 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index db5429d62d71b84b661e61fecc26945e81397cb4..f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 
+       #62365
+
 2001-10-22  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_window_type): fix 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index db5429d62d71b84b661e61fecc26945e81397cb4..f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 
+       #62365
+
 2001-10-22  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_window_type): fix 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index db5429d62d71b84b661e61fecc26945e81397cb4..f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 
+       #62365
+
 2001-10-22  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_window_type): fix 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index db5429d62d71b84b661e61fecc26945e81397cb4..f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 
+       #62365
+
 2001-10-22  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_window_type): fix 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index db5429d62d71b84b661e61fecc26945e81397cb4..f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 
+       #62365
+
 2001-10-22  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_window_type): fix 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index db5429d62d71b84b661e61fecc26945e81397cb4..f7b28ac0cd1454e289e5e0acc8e01f6d2cb022a1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-10-22  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_get_border_window_size): fix 
+       #62365
+
 2001-10-22  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_get_window_type): fix 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 94869650a9337de36c75c581ea04d10da1101ac9..3296fc30f654e778cea61625af28333c25e539a3 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -6285,25 +6285,27 @@ gtk_text_view_get_border_window_size (GtkTextView       *text_view,
                                      GtkTextWindowType  type)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
-  g_return_val_if_fail (type != GTK_TEXT_WINDOW_WIDGET, 0);
-  g_return_val_if_fail (type != GTK_TEXT_WINDOW_TEXT, 0);
   
   switch (type)
     {
     case GTK_TEXT_WINDOW_LEFT:
-      return text_view->left_window->requisition.width;
+      if (text_view->left_window)
+        return text_view->left_window->requisition.width;
       
     case GTK_TEXT_WINDOW_RIGHT:
-      return text_view->right_window->requisition.width;
+      if (text_view->right_window)
+        return text_view->right_window->requisition.width;
       
     case GTK_TEXT_WINDOW_TOP:
-      return text_view->top_window->requisition.height;
+      if (text_view->top_window)
+        return text_view->top_window->requisition.height;
 
     case GTK_TEXT_WINDOW_BOTTOM:
-      return text_view->bottom_window->requisition.height;
+      if (text_view->bottom_window)
+        return text_view->bottom_window->requisition.height;
       
     default:
-      g_warning ("Can only get size of left/right/top/bottom border windows with gtk_text_view_get_border_window_size in %s\n", G_STRLOC);
+      g_warning ("Can only get size of left/right/top/bottom border windows with gtk_text_view_get_border_window_size()");
       break;
     }